[automerger skipped] Merge "[SP31] Expose onSetWarningAndLimit System API" am: 24a5630161 am: c903776d23 am: ecf81a98bd -s ours

am skip reason: skip tag Change-Id I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf with SHA-1 a22175603b is already in history

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

Change-Id: I6b291378c413fada7299afa2c4243dc7afc0b5be
tree: e4d7e827f45c43003ddd7a368b98deab05b96225
  1. core/
  2. services/