Merge "Moved urlBarResourceId from autofill service manifest to whitelist settings." into pi-dev am: 9e56800b6e
am: f31e8da93b

Change-Id: Ia74afca9bbe4ac0fb248eb368a747d7a321604ef