Merge changes from topic "mvstub" am: ced0bbd1 am: 68e49ada am: b47fe3b8...

Merge changes from topic "mvstub" am: ced0bbd1 am: 68e49ada am: b47fe3b8 am: 86b7e6e7 am: ee351cee

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



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