Merge "Check for null ferr" am: 4cc14c6d am: cf5ce06b am: 68094662 am:...

Merge "Check for null ferr" am: 4cc14c6d am: cf5ce06b am: 68094662 am: 0de01814 am: 861a0865

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



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