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