[automerger skipped] Merge "Support PersistableBundle type config values in...

[automerger skipped] Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" am: 4797e99e am: 5d15fd10 am: d6272afe -s ours

am skip reason: Merged-In Idb564cf44d7d321b95cccb18798992e718f30da4 with SHA-1 d0a56a1c is already in history

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



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