Merge "Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev am: 8ac5a94c01" into oc-dr1-dev-plus-aosp