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