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