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