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