Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7

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

Change-Id: I536751f25c66be56eeab2f22e941a46ea80c3b96