Merge "Fix flag manager crash" into sc-v2-dev am: 3f5835d848 am: 68edfb0930

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

Change-Id: I6b1c755fbd98941eff05256e89b991ac5972d0ff