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

Change-Id: Ib8813180543283bc7568cf0f2b74353cfc8887d4