Merge changes I1d1f0d2d,Ifbd4a978 am: c4f2a30c20 am: 6c13a37bac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7386dfb19911f1b9db39df3b809d18742cc13a75