Merge "[SP31] Expose onSetWarningAndLimit System API" am: 24a5630161 am: c903776d23

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

Change-Id: I022b2d130729f31fbd3fe8edaec6c998cdcd2aa4