Merge changes from topic "remote_provisioning_diagnostics" am: 696dce6c am:...

Merge changes from topic "remote_provisioning_diagnostics" am: 696dce6c am: b8f747cd am: 6d14cd87 am: 27a514cb am: 9637a586

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



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