ebcfa668d0
cbe669b2d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570643 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee784debc7c734c0d4b9d5ee9a726d960822bd18