Merge "Differentiate Sim App Dialog layout for AOSP" into pi-dev
am: 1dfd9c8167

Change-Id: Ica533e245881f6132bcdc1bd09689cc44eb5b329