Merge changes from topic "b-216643999-scv2" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE Add additional unavailable toggle drawable state 2p: ce0826089f
  DO NOT MERGE Add additional unavailable toggle drawable state