Merge "Generate per-use prompt only when the process is foreground" into...

Merge "Generate per-use prompt only when the process is foreground" into tm-dev am: e24c01a1 am: 11cda3d1 am: 1b9988ff

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



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