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: I055412eb9f1ebd8f19374c0269e007832612b8d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>