Merge changes from topic "Face Intro Changes" into qt-dev

author Kevin Chyn <kchyn@google.com>

Wed, 8 May 2019 23:55:22 +0000 (23:55 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 8 May 2019 23:55:22 +0000 (23:55 +0000)
author Kevin Chyn <kchyn@google.com>
Wed, 8 May 2019 23:55:22 +0000 (23:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 8 May 2019 23:55:22 +0000 (23:55 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Kevin Chyn <kchyn@google.com>
	Wed, 8 May 2019 23:55:22 +0000 (23:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 8 May 2019 23:55:22 +0000 (23:55 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history