Merge "Freeze kernel configs for r." into rvc-dev am: e0386a9f7c

Change-Id: I13681a757f2ff803ab7bc2135de60b7b772c2338