Merge "profcollectd: OTA Observer" am: 14a7d344a4 am: ebd04e98ee

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

Change-Id: I2b7cda7d3d7fe133bb4af6585fb4afca3b0fbaa3