f3aa76929d
abde91d556
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1588534 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8aaaeb7a3f9a19a4b4438f7c6b87a1b14d6850e