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: 9be0b72e am: 8ed87f1e

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

Change-Id: If8a0019b8058665bc0d5cc128009d4a889a1b6ec