Merge "Restore force relayout logic for apps targeting < R" into rvc-dev am: 98f012c304

Change-Id: I53617d5f35e00cf69dd4e22cb8f5477cbe448ca1