Merge "Adjust obb path to be able calculate external's codeSize well wo/quota" am: d9fffc5b5f am: 413433fffa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2630036

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