Merge changes from topic "cp_slim" am: a90cb087c0 am: d7a1549e2d am: 59bd3059cc

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

Change-Id: If69a6f819c50a2d00ed2161ffc49b78dcd545d98