Merge "Set title for privacy dialog" into tm-dev am: e2b3d4ec am: 9b923a22 am: 325017c1 am: 30dfe9ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958128



Change-Id: Ia5023a016a82f21e26af40a83f242e958875ba14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>