[automerger skipped] Merge "Revert "Read and cache features when user switches"" into rvc-qpr-dev am: ce7cd417 am: 2d461c8f -s ours

am skip reason: Change-Id I0187e27b641edf0836fa187530cb2a193082fe5d with SHA-1 1cae475b is in history

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

Change-Id: Ia60635fc5fcbaf016394e5129a0955eef95cf704