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