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