Merge "Merge "Make Dismiss Icon under Cards show up only when focused." into...
Merge "Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb am: 608e919b" into nyc-mr1-dev-plus-aosp
am: 26b16742
* commit '26b16742':
Change-Id: Icd37b6c22554e3216d28a752072079e64d8d514a