Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
am: d04b49649e

Change-Id: I25ff49cb0ce6ab6cb4cfb35aef254d3881e343e1