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



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