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

Change-Id: I97b8993491e9a7441177f9d521f9971cf2c155a5