Merge "Merge "Don't allow foreground notis to be blocked inline." into pi-dev am: 874b009137" into pi-dev-plus-aosp
am: 3fa676bb7e

Change-Id: I9e669848d7f04bd9a14aab048bbfd8734efb78c4