Merge "Fix INTERACT_ACROSS_USERS change version" into tm-dev am: 970cdf91 am: 8c2d5525

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



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