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

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

Change-Id: Ie7b5bd929dba5bdaee67e5381bcac7099c1e0596