Merge "Limit Predictions size based on count instead of time" into sc-dev am: cc8ce71a am: e6f967ec

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

Change-Id: Ie7018fbc9f98dc7943d99d1e485312e883c558eb