Merge "[SP31] Expose onSetWarningAndLimit System API" am: fc6a6628b9 am: 5d4287d895

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

Change-Id: I022b2d130729f31fbd3fe8edaec6c998cdcd2aa4