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 am: 64a1ad9d

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



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