Merge "Fix INTERACT_ACROSS_USERS change version" into tm-dev am: 970cdf91 am: 84f256e3

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



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