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

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



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