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