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

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



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