Merge "Merge "Update text alignment when using drawTextOnPath." into pi-dev am: 77e74b64eb" into pi-dev-plus-aosp
am: e7b208392a

Change-Id: I67bfd5970ad303909ff2ff09570fcf0ee4c034ef