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: 506ef4a2 am: 01bed53e

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

Change-Id: I23c75e4e5440eda1161a70eaba6b12dc3ee38c92