Merge "[automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 4e3507d544 -s ours am: b59effc883" into pi-dev-plus-aosp