Merge "Set title for privacy dialog" into tm-dev am: e2b3d4ec am: 2395639e am: 199a1fbd am: 93307847

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



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