[automerger skipped] Merge "Fix RRO loading from inside APEXes." am:...

[automerger skipped] Merge "Fix RRO loading from inside APEXes." am: de3baffb am: 23cd20c9 am: 09341a5e am: c1ceac41 am: 92e4b728 -s ours

am skip reason: Merged-In I2bce9bc704789329b8c6aac6d476f17ff6718e0f with SHA-1 66ebced1 is already in history

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

Change-Id: I025848bac43ba51ba982ed88bddd4533dbb83e05