Merge changes I67e5fa23,I223b207c am: 32f5d14cef

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

Change-Id: I74209eccb2fd5473d65968f765f3eb54ee99954e