[automerger skipped] [automerger] Do not allow draw on top for default sms...

[automerger skipped] [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f am: b810aee2 am: 7a585891 am: 79261318 am: d6bde3f5 am: ba87cf74 am: 9366d11e am: 657f8713 am: 1b29c28a
am: 0ee2857d -s ours
am skip reason: change_id I4be265565678302fad207839216d5cd65dcb6e94 with SHA1 9d46e1fd is in history

Change-Id: Ie84c7488db95a1693b8f6bf3ceaf7033dc3acc75