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

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

Change-Id: Ibce370038bd18ac725c32732023bcbdc68957bf6