[automerger skipped] Merge "[SP31] Expose onSetWarningAndLimit System API" am: fc6a6628b9 am: 5d4287d895 am: e5144d8d44 -s ours
am skip reason: skip tag Change-Id I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf with SHA-1 e6e90d34a2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625864
Change-Id: I6b291378c413fada7299afa2c4243dc7afc0b5be
This commit is contained in: