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

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

Change-Id: I7c08670ac64a520fa45681bc15fefea5d4026205