[automerger skipped] Merge "[res] Preserve the resid order in ThemeKey" into...

[automerger skipped] Merge "[res] Preserve the resid order in ThemeKey" into udc-dev am: 375d6489 am: f57406f6 am: bf99a6ac -s ours

am skip reason: Merged-In If547e16a15f5f7294fc863852171c96e10402cf7 with SHA-1 99be40df is already in history

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



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