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