[automerger skipped] Merge "secret code not include...
[automerger skipped] Merge "secret code not include FLAG_RECEIVE_INCLUDE_BACKGROUND" am: 3171e248 am: ac8fd3f7
am: 49762fab -s ours
am skip reason: change_id I2b684fe9ca5c11faadc5ed29e91eca6e6368bd50 with SHA1 ce84d7ef is in history
Change-Id: I74ed23f5b53f40dc31b6ce9a056b7f259b91807f