Merge "[automerger skipped] Merge "[res] Preserve the resid order in ThemeKey" into udc-dev am: 375d6489 am: 896590b7 -s ours" into udc-d1-dev-plus-aosp am: b9e422c3 -s ours am: 3ffe97fe -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: I29d5ff9900a3d6d24efbcc8f116415e47f84d2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>