Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2509415 Change-Id: I0f2388c8d60d49bb697d64ce27a8e408729c497b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>