Merge "Added a hidden modelState to indicate model was deleted from device but available still." into sc-dev am: e4724a8e am: f152f0b7

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

Change-Id: Ide3b18c150397e0ced15b90e83a2edf88146a92c