Merge "Show privacy dialog on secondary user calls" into sc-qpr1-dev am:...

Merge "Show privacy dialog on secondary user calls" into sc-qpr1-dev am: c8e92727 am: 4e89c16d am: 18feca30

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

Change-Id: Ib93015e523e030356058e6634a1c9cc8f6d0c70e