Merge changes from topic "runtime_skipcache" am: af04506edd am: 8ac7d59373 am: 71c3f1d873 am: bc03370ae9

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

Change-Id: I2f83ef63367df41f080a0f50508db9cfefdf7625