Merge \"Add top and bottom panel overlay to lists in AlertDialog for watch.\" into nyc-mr1-dev
am: ad74941699

Change-Id: I36e7157a24141db4cd17828206435788b8abb69a