Merge "Fixed a bug where the summary could become visible even if it was suppressed am: 80c44dd800 am: b665b73437" into nyc-mr1-dev-plus-aosp
am: 84acf63a77

Change-Id: I50831cceff062c4568a9adfdb7ba42d4f959fb80