Merge changes I17264f0e,I0581978f am: 06c8be69b9 am: d9a6df3947 am: 7a30e9f8dd am: 326230d491

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

Change-Id: Ica2a9bc91dbdf8ab878b0cbfa141e5935735ce6f