[automerger skipped] Merge "DMS: check cached mode for user apps only" into...

[automerger skipped] Merge "DMS: check cached mode for user apps only" into udc-qpr-dev am: e54f99ce am: 1614a18e -s ours

am skip reason: Merged-In I3fb20327979eca8774f7ddf143b2b8f2386e6b56 with SHA-1 5653c6b5 is already in history

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



Change-Id: Ib224059fd48b569749e553454c731dd384f69a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>