Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e68

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

Change-Id: I9c82ab5e998212d52fd512e4ea7affe010d86d4a