Merge changes from topic "runtime_skipcache" am: af04506edd

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

Change-Id: I5b8dbbebca9353d38544d9f4d282d046cfab6556