Merge changes I0faeda20,I726e74f5 am: 4cea2d3830

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

Change-Id: I2adf488439c8aecf2d3dac2438b848bbdc868a21