merge in klp-release (no-op)
Import translations. DO NOT MERGE

Change-Id: I443b01b550cb0e1d98818db042dcb1c8fbd19059
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE" into klp-dev
Import translations. DO NOT MERGE

Change-Id: I930a2209b1b7e2fcc03ed448b0abcb127b70b86b
Auto-generated-cl: translation import
HCE: Fix potential crash and handle Android AID.

For new "default route" CTS test. Also, fix
a potential crash for starting off-host services
and check that HCE services have declared the
NFC permission.

Bug: 10681671
Change-Id: If86d9820d6eef5a0661be92be67168d5f81ddc64
Import translations. DO NOT MERGE

Change-Id: Ibfd34791605d53500be71f7c09223e198370fbf0
Auto-generated-cl: translation import
Increase NFC-A guard time to work around B5 issue.

Increase NFC-A guard time in reader mode, to make
sure we properly wake up BCM20791B05 devices.

Bug: 10852675
Change-Id: Ia30972d5d7850171bc58068c5d6896025eb6c2c1
Merge branch 'android-4.4.1_r1' into HEAD