Merge "Merge "Fix a leak in HasSystemFeatureCache." into rvc-dev am:...
Merge "Merge "Fix a leak in HasSystemFeatureCache." into rvc-dev am: 675a58b2 am: 03255a22" into rvc-d1-dev-plus-aosp am: b4139efd
Change-Id: Ie226d53fceee4084fdbd83fcaf3dbc74fdfb8221