DO NOT MERGE: Don\\\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf  -s ours am: c61f35ed9a am: 34fb87b519 am: 1a450675f3 am: 790c87a05b  -s ours am: 02435d2419 am: 313dec8155
am: 01a7aa1e7b  -s ours

Change-Id: I4a522be72fe9cdcd0ee53863c9d2bea558fd6ffb