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

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



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