Merge changes from topics "shelf-refactor-anv", "shelf-refactor-click" into udc-dev am: 0948e76a

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



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