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