Merge "Add missing cassert includes" am: 565f2ab1 am: 1bfdac63

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



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