Original change: https://android-review.googlesource.com/c/platform/development/+/1547214 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5731ea89669d8b954f730549e263f4aada37306e
Original change: https://android-review.googlesource.com/c/platform/development/+/1547214 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5731ea89669d8b954f730549e263f4aada37306e