[automerger skipped] [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8 am: ba87cf7444 am: 9366d11e6d am: 657f8713ff am: 1b29c28aef
am: 0ee2857d0a -s ours
am skip reason: change_id I4be265565678302fad207839216d5cd65dcb6e94 with SHA1 9d46e1fdfe is in history

Change-Id: Ie84c7488db95a1693b8f6bf3ceaf7033dc3acc75