Add back increasing ring feature (1/3)

Change-Id: I76c22ea94f25c576972361ad0ab209accb8ae1de
frameworks: fix Blacklist support for L (3/3)

Change-Id: Ide9847344dd1260cc4d8e4fa5c6b461ea7aa3ded
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge remote-tracking branch 'cm/cm-12.0' into 5.0