Merge changes from topics "GET_USER_HANDLE_FLAG", "subscription_apis" am: d118f3ef am: 66accd72

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



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