[automerger skipped] Merge "Fix caching runtime toggle" into sc-dev am:...

[automerger skipped] Merge "Fix caching runtime toggle" into sc-dev am: 7f09431b am: baebe618 -s ours

am skip reason: Merged-In I6926e69fb9762209c958beceb2679cd7a5806306 with SHA-1 c773472b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14649530

Change-Id: Ifdc8a653651126ac25214e8362a060d762e69e7c