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

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

Change-Id: Icd4d04ebcf0992f956d20797f08fa315ca5584e2