Merge "Remove usage of mFileName in ObbInfo" am: 9568ba7399 am: b7c510225f am: 5c34b1be69

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

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