Merge changes Ieeb0ebef,I1f33a8c6,I07168a7b am: fb5d22ffea

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1647333

Change-Id: Ia4ea907d437a55bcad939af07c0d507e1df7d65a