Merge changes I9881453b,I57fa88c6 into stage-aosp-master am: c227f6f1e0

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

Change-Id: I6e2c1091ad8df9a58368db0ac024bb91a97fab3f