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