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

Merge "Taking userId into account for fixupAppDir()." into rvc-dev am: 84825abd am: f3bd9acc am: 0fd1e095 am: 41bc59d5

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

Change-Id: Id46beccbe72724a9c1f4f5c723bbb375a421b7bb