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

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

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

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

Change-Id: I87f2702a4fdead988133e8e712d997f11378e3af