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

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

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