Added 15 APIs support am: 00dc8a15e9 am: 148b644ba3

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

Change-Id: I4a11c725543a279a0abf711e16925ccea0de152c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>