[automerger skipped] Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev am: 12510978c3 am: 925e9771ea -s ours
am skip reason: Change-Id I72f9a947f57f74a8c09127d6c39173594c248ddc with SHA-1 647e49e7cf is in history

Change-Id: Iaebfc1e3fabfb4d6c7a4347f13bc91f5f3f920ef