Merge "profcollectd: OTA Observer" am: 14a7d344a4

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

Change-Id: If4daf34734dea92f027c80314a4f222d2e24b8ee