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