Merge "Export FrontendDvbtPlpMode" am: 4556d59c3a am: c61fdd1fb4

Change-Id: I1bc37de80521dd35593378f04175d5a66ad64f48