[automerger skipped] Support for unavailable and disabled affordances. am:...

[automerger skipped] Support for unavailable and disabled affordances. am: af8fd1b3 am: 4459e7dc -s ours

am skip reason: Merged-In I77637f28cdacecaa02ab33603bbc008a501d03d1 with SHA-1 2bc57915 is already in history

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



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