Merge "Make ChangeReporter.{Status,Source} proper enums" am: a421f8ff53 am: cdd4f0bdaf am: 4d61ec6e60

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

Change-Id: Ib1c2122bb8fdc876529faf37954e1745b5e73805