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

Change-Id: I36edad9605ee41e73d45949362fbd1762c92c6b6