Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21471763



Change-Id: I49c2b1deab7393a774c8a62f14b3aa1364102347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>