Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev