[automerger skipped] Merge "Remove FLAG_RECEIVER_INCLUDE_BACKGROUND from code...
[automerger skipped] Merge "Remove FLAG_RECEIVER_INCLUDE_BACKGROUND from code to whitelist" am: beb168af am: ea5d1c49 -s ours
am skip reason: Change-Id I24d7f3a93de96bb367495a48e1e671501536dd44 with SHA-1 9152f3f5 is in history
Change-Id: Ib7c463cbf7afe134760d902237f06fd5a47f7902