Merge changes I8bc68d10,Ie6182fa4 am: 8fa5ddae14 am: 9af472a15d am: c66d472cc3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2046463 Change-Id: I6252bd42f6d5c67a7e9641d2451e819d85840754 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: