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

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

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