Merge "Merge "Disabled items shouldn't also be marked as unactionable." into qt-dev am: 0963cc2418 am: 41f0326426" into qt-r1-dev-plus-aosp
am: 437c4a6cc7

Change-Id: I4077d294b3d872dcf30a7ab16697365d3e2c5d57