[automerger skipped] Merge "[SP28] Add API for set data warning" am: f1a1d71020 am: e09bf898ea am: c462315620 -s ours

am skip reason: skip tag Change-Id I6ee661497f7dedb871c85786d1950cab951d8aa2 with SHA-1 cc6bc70bbf is already in history

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

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