Merge changes from topic "mvstub" am: ced0bbd1df am: 68e49ada80 am: b47fe3b861

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

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