Merge "profcollectd: OTA Observer" am: 14a7d344a4 am: ebd04e98ee am: 6f99c0e76a am: 4bd5549302

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

Change-Id: I7b7ad794dec5ed32677eb70ba080ae7eb41b7b8d