Merge "Add default URL bar resource id for autofill compat mode." into pi-dev am: c2ecfd9754
am: 5758dbfe41

Change-Id: Ibcc5d31d4c05c7bd0cc6945e0349df4599b86e5e