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