Merge "Fix RRO loading from inside APEXes." am: de3baffb29 am: 23cd20c926

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

Change-Id: I2d2fdda8b4f0fc6f4c9b32ca3e2e1c810b3d5384