[automerger skipped] Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" into pi-dev am: 034e39679d
am: baadcabd04  -s ours

Change-Id: I160dbfe42d56c05ea02ca2a41a8df4f16f7438ec