Merge "CTS: Modify testShow case in DialogTest" am: b10094adb9
am: 1ce5d6825c

Change-Id: I696707a677f457504e12439e821216467c60b954