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