Merge changes from topics "shelf-refactor-anv", "shelf-refactor-click" into...

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

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



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