Merge "Taking userId into account for fixupAppDir()." into rvc-dev am:...

Merge "Taking userId into account for fixupAppDir()." into rvc-dev am: 84825abd am: 20789d9a am: 63012b19 am: c2bcf788

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

Change-Id: Ibcac7bb1560793738754a6a4b6fa5225d20a5a25