Merge "Add check for optimize after each mutation operation." into sc-dev am: 9ba07e8743 am: a6116d889c

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

Change-Id: I575fe99c2b839cac7b4d92dc865ca05f07a2598b