Merge "Remove usage of mFileName in ObbInfo" am: 9568ba7399 am: b7c510225f am: 5c34b1be69 am: 781f0dd4a8 am: d74fc2ad01 am: b0648d6070

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

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